core: Make ostree_set_xattrs() private

Nothing external uses it.  We keep ostree_get_xattrs_for_file() public
because it's convenient for external consumers to get xattrs in
exactly the format we desire.

https://bugzilla.gnome.org/show_bug.cgi?id=707733

diff --git a/src/libostree/ostree-core-private.h b/src/libostree/ostree-core-private.h
index 3fe67f9ca8e936d47664404f7def00aa546a354d..b564c2157de975cf1d854b87ec9780196be0128c 100644 (file)
--- a/src/libostree/ostree-core-private.h
+++ b/src/libostree/ostree-core-private.h
@@ -80,6 +80,10 @@ _ostree_set_xattrs_fd (int            fd,
                        GCancellable  *cancellable,
                        GError       **error);
 
+gboolean _ostree_set_xattrs (GFile *f, GVariant *xattrs,
+                             GCancellable *cancellable, GError **error);
+
+
 /* XX + / + checksum-2 + . + extension, but let's just use 256 for a
  * bit of overkill.
  */

diff --git a/src/libostree/ostree-core.c b/src/libostree/ostree-core.c
index 185aa82d69d614483ebf626a1bb1929e6944a9b5..f43f58ae68c9c199b31d9ceffe5438c9edea21c0 100644 (file)
--- a/src/libostree/ostree-core.c
+++ b/src/libostree/ostree-core.c
@@ -1073,8 +1073,8 @@ _ostree_set_xattrs_fd (int            fd,
   return ret;
 }
 
-/**
- * ostree_set_xattrs:
+/*
+ * _ostree_set_xattrs:
  * @f: a file
  * @xattrs: Extended attribute list
  * @cancellable: Cancellable
@@ -1085,10 +1085,10 @@ _ostree_set_xattrs_fd (int            fd,
  * attributes.
  */
 gboolean
-ostree_set_xattrs (GFile  *f, 
-                   GVariant *xattrs, 
-                   GCancellable *cancellable, 
-                   GError **error)
+_ostree_set_xattrs (GFile  *f, 
+                    GVariant *xattrs, 
+                    GCancellable *cancellable, 
+                    GError **error)
 {
   const char *path;
   gboolean ret = FALSE;

diff --git a/src/libostree/ostree-core.h b/src/libostree/ostree-core.h
index 2a0a85645151074f0cd60e383a9dc53a58d106c3..743ca8f11ba347f88d2d744ff9af22b68ffb71c4 100644 (file)
--- a/src/libostree/ostree-core.h
+++ b/src/libostree/ostree-core.h
@@ -176,9 +176,6 @@ gboolean ostree_get_xattrs_for_file (GFile         *f,
                                      GCancellable  *cancellable,
                                      GError       **error);
 
-gboolean ostree_set_xattrs (GFile *f, GVariant *xattrs,
-                            GCancellable *cancellable, GError **error);
-
 gboolean
 ostree_content_stream_parse (gboolean                compressed,
                              GInputStream           *input,

diff --git a/src/libostree/ostree-repo-checkout.c b/src/libostree/ostree-repo-checkout.c
index 83ed91106a5b538f048b8510e3305e1b2f0fdca6..d307db5a5d095a4d3cdeab98c2cdfbd293526f1c 100644 (file)
--- a/src/libostree/ostree-repo-checkout.c
+++ b/src/libostree/ostree-repo-checkout.c
@@ -217,7 +217,7 @@ create_file_from_input (GFile            *dest_file,
 
   if (xattrs != NULL)
     {
-      if (!ostree_set_xattrs (dest_file, xattrs, cancellable, error))
+      if (!_ostree_set_xattrs (dest_file, xattrs, cancellable, error))
         goto out;
     }
 

diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c
index 1a49b7539169b7f507d5a880393ce408e58cd668..d983cd20eeeb39c743264cfcabdd64409b38cec3 100644 (file)
--- a/src/libostree/ostree-repo-commit.c
+++ b/src/libostree/ostree-repo-commit.c
@@ -91,7 +91,7 @@ commit_loose_object_trusted (OstreeRepo        *self,
        */
       if (xattrs != NULL)
         {
-          if (!ostree_set_xattrs (temp_file, xattrs, cancellable, error))
+          if (!_ostree_set_xattrs (temp_file, xattrs, cancellable, error))
             goto out;
         }
     }